| commit | 7d575a5e95514414281eb8f7d33d12c1b396edd2 | [log] [tgz] |
|---|---|---|
| author | Junio C Hamano <junio@hera.kernel.org> | Wed Apr 30 08:45:27 2008 |
| committer | Junio C Hamano <junio@hera.kernel.org> | Wed Apr 30 08:45:27 2008 |
| tree | 1e90272279f86a84a2555173a04bb793de6145d9 | |
| parent | 9ab876720cbaa7bef5a4fd4e8b831d52e5b5cf04 [diff] [blame] |
Autogenerated HTML docs for v1.5.5.1-114-g8d308
diff --git a/gitk.txt b/gitk.txt index ed3ba83..50d12da 100644 --- a/gitk.txt +++ b/gitk.txt
@@ -41,6 +41,12 @@ Show all branches. +--merge:: + + After an attempt to merge stops with conflicts, show the commits on + the history between two branches (i.e. the HEAD and the MERGE_HEAD) + that modify the conflicted files. + <revs>:: Limit the revisions to show. This can be either a single revision